From: Joey Hess <joeyh@joeyh.name>
Date: Tue, 7 Jan 2025 18:13:46 +0000 (-0400)
Subject: Fix installation on Android
X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~10^2~42
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=cbc83c03867ecdde7570a616574664dcd0cc55ac;p=git-annex.git

Fix installation on Android

Unfortunately, commit ce95cac19501bfbffd610203083510888a6b9646 broke
android installation way back in May of last year.
---

diff --git a/CHANGELOG b/CHANGELOG
index cdef9716d2..b401848477 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ git-annex (10.20250103) UNRELEASED; urgency=medium
   * log: Support --key, as well as --branch and --unused.
   * Avoid verification error when addurl --verifiable is used
     with an url claimed by a special remote other than the web.
+  * Fix installation on Android.
 
  -- Joey Hess <id@joeyh.name>  Fri, 03 Jan 2025 14:30:38 -0400
 
diff --git a/doc/bugs/Android_Installation_Error.mdwn b/doc/bugs/Android_Installation_Error.mdwn
index bf16d41eac..1536276f74 100644
--- a/doc/bugs/Android_Installation_Error.mdwn
+++ b/doc/bugs/Android_Installation_Error.mdwn
@@ -28,3 +28,6 @@ I have tried downloading the `.tar.gz` file and extracting it manually. Inside I
 ### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
 
 Works great on all of my Fedora, Ubuntu, and Rocky machines!
+
+> Thanks for reporting, I have now fixed the bug in runshell. [[done]]
+> --[[Joey]]
diff --git a/doc/bugs/Installation_error_on_android.mdwn b/doc/bugs/Installation_error_on_android.mdwn
index 3e1fbc1638..21102fc2ab 100644
--- a/doc/bugs/Installation_error_on_android.mdwn
+++ b/doc/bugs/Installation_error_on_android.mdwn
@@ -73,4 +73,4 @@ sed: can't read /data/data/com.termux/files/home/git-annex.linux/git-remote-anne
 
 ### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
 
-
+> [[fixed|done]] --[[Joey]]
diff --git a/doc/bugs/Installation_error_on_android/comment_3_15c32517b85b6e91b7388d4f861eaf37._comment b/doc/bugs/Installation_error_on_android/comment_3_15c32517b85b6e91b7388d4f861eaf37._comment
new file mode 100644
index 0000000000..a8c6e7f075
--- /dev/null
+++ b/doc/bugs/Installation_error_on_android/comment_3_15c32517b85b6e91b7388d4f861eaf37._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 3"""
+ date="2025-01-07T18:11:59Z"
+ content="""
+Indeed that is the same bug. And I've fixed it now, the next daily build
+and release will have the fix.
+"""]]
diff --git a/standalone/linux/skel/runshell b/standalone/linux/skel/runshell
index bbf2aad271..1360d31fe8 100755
--- a/standalone/linux/skel/runshell
+++ b/standalone/linux/skel/runshell
@@ -206,7 +206,7 @@ case "$os" in
 			# The bundled git does not work well on sdcard, so delete
 			# it and use termux's git which works better.
 			cd "$base"
-			find . | grep git | grep -v git-annex | grep -v git-remote-tor-annex | grep -v git-remote-gcrypt | xargs rm -rf
+			find . | grep git | grep -v git-annex | grep -v git-remote-annex | grep -v git-remote-tor-annex | grep -v git-remote-gcrypt | xargs rm -rf
 			# Use termux's uname, which knows it's on android,
 			# not the bundled one.
 			rm -f bin/uname